gdk: Deprecate GdkDeviceManager and gdk_device_grab/ungrab()

GdkSeat is now the preferred way to deal with input devices and grabs.

https://bugzilla.gnome.org/show_bug.cgi?id=759309

diff --git a/gdk/gdkdevice.c b/gdk/gdkdevice.c
index 1fd1ea7ec82134365e7f033b3b3b030a72f30165..db36ced326483ce6a962302cd248c8e65ddaf85e 100644 (file)
--- a/gdk/gdkdevice.c
+++ b/gdk/gdkdevice.c
@@ -1360,6 +1360,8 @@ get_native_grab_event_mask (GdkEventMask grab_mask)
  * Returns: %GDK_GRAB_SUCCESS if the grab was successful.
  *
  * Since: 3.0
+ *
+ * Deprecated: 3.20. Use gdk_seat_grab() instead.
  **/
 GdkGrabStatus
 gdk_device_grab (GdkDevice        *device,
@@ -1433,6 +1435,8 @@ gdk_device_grab (GdkDevice        *device,
  * Release any grab on @device.
  *
  * Since: 3.0
+ *
+ * Deprecated: 3.20. Use gdk_seat_ungrab() instead.
  */
 void
 gdk_device_ungrab (GdkDevice  *device,

diff --git a/gdk/gdkdevice.h b/gdk/gdkdevice.h
index a1d9cd3c814383368ec4ff73b5c31212216a8e3e..49d6777e60a604e8cd25c958acde44da18d57734 100644 (file)
--- a/gdk/gdkdevice.h
+++ b/gdk/gdkdevice.h
@@ -246,7 +246,7 @@ GList *      gdk_device_list_slave_devices    (GdkDevice     *device);
 GDK_AVAILABLE_IN_ALL
 GdkDeviceType gdk_device_get_device_type (GdkDevice *device);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_20_FOR(gdk_seat_grab)
 GdkGrabStatus gdk_device_grab        (GdkDevice        *device,
                                       GdkWindow        *window,
                                       GdkGrabOwnership  grab_ownership,
@@ -255,7 +255,7 @@ GdkGrabStatus gdk_device_grab        (GdkDevice        *device,
                                       GdkCursor        *cursor,
                                       guint32           time_);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_20_FOR(gdk_seat_ungrab)
 void          gdk_device_ungrab      (GdkDevice        *device,
                                       guint32           time_);
 

diff --git a/gdk/gdkdevicemanager.c b/gdk/gdkdevicemanager.c
index 3da434d703ec60dcd8a288c68d273211539b4a16..26fc7642b921478150ba29c6bbd5737ca260ae9c 100644 (file)
--- a/gdk/gdkdevicemanager.c
+++ b/gdk/gdkdevicemanager.c
@@ -323,6 +323,9 @@ gdk_device_manager_get_display (GdkDeviceManager *device_manager)
  *          GTK+ and must not be freed or unreffed.
  *
  * Since: 3.0
+ *
+ * Deprecated: 3.20, use gdk_seat_get_pointer(), gdk_seat_get_keyboard()
+ *             and gdk_seat_list_slaves() instead.
  **/
 GList *
 gdk_device_manager_list_devices (GdkDeviceManager *device_manager,
@@ -348,6 +351,8 @@ gdk_device_manager_list_devices (GdkDeviceManager *device_manager,
  *          owned by GDK and must not be freed or unreferenced.
  *
  * Since: 3.0
+ *
+ * Deprecated: 3.20.
  **/
 GdkDevice *
 gdk_device_manager_get_client_pointer (GdkDeviceManager *device_manager)

diff --git a/gdk/gdkdevicemanager.h b/gdk/gdkdevicemanager.h
index b1ec4bd519b64a2613a56f120a1b3a92556cf821..e68f34aab2dcc247892ef9ea0c2ad0c5e9c6224f 100644 (file)
--- a/gdk/gdkdevicemanager.h
+++ b/gdk/gdkdevicemanager.h
@@ -37,10 +37,10 @@ GType        gdk_device_manager_get_type           (void) G_GNUC_CONST;
 
 GDK_AVAILABLE_IN_ALL
 GdkDisplay * gdk_device_manager_get_display        (GdkDeviceManager *device_manager);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_20
 GList *      gdk_device_manager_list_devices       (GdkDeviceManager *device_manager,
                                                     GdkDeviceType     type);
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_20
 GdkDevice *  gdk_device_manager_get_client_pointer (GdkDeviceManager *device_manager);
 
 G_END_DECLS

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 0a4b56d63a284ce359600a7e21b8b7b8d41f340c..c8dd9b6845ebdc2cd5d77ff52c865ed7388f8402 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -1491,6 +1491,8 @@ gdk_display_device_is_grabbed (GdkDisplay *display,
  *          or unreferenced.
  *
  * Since: 3.0
+ *
+ * Deprecated: 3.20. Use gdk_display_get_default_seat() and #GdkSeat operations.
  **/
 GdkDeviceManager *
 gdk_display_get_device_manager (GdkDisplay *display)

diff --git a/gdk/gdkdisplay.h b/gdk/gdkdisplay.h
index 9e30d877d8260e456b14db9a8489de0c87648ec9..6e06cc8586ecd074ce6d7f2863ab4190e83e95de 100644 (file)
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -166,7 +166,7 @@ GDK_AVAILABLE_IN_ALL
 void     gdk_display_notify_startup_complete   (GdkDisplay    *display,
                                                 const gchar   *startup_id);
 
-GDK_AVAILABLE_IN_ALL
+GDK_DEPRECATED_IN_3_20_FOR(gdk_display_get_default_seat)
 GdkDeviceManager * gdk_display_get_device_manager (GdkDisplay *display);
 
 GDK_AVAILABLE_IN_ALL